Merge branch 'rust-master' of https://github.com/gbsf/cargo into update
authorAlex Crichton <alex@alexcrichton.com>
Wed, 4 Feb 2015 18:07:07 +0000 (10:07 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Wed, 4 Feb 2015 18:07:07 +0000 (10:07 -0800)

Trivial merge